Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tar2files bazel integration #66

Merged
merged 1 commit into from
Dec 12, 2023
Merged

Fix tar2files bazel integration #66

merged 1 commit into from
Dec 12, 2023

Conversation

andreabolognani
Copy link
Collaborator

The names that are passed to bazeldnf need to include the directory part too, otherwise having two files with the same name in different paths triggers a failure:

+ bazel run --config x86_64 //rpm:sandbox_s390x
...
Error in _tar2files: generated file 'cc-toolchain_s390x/errno.h'
in rule 'cc-toolchain_s390x/usr/include/asm' conflicts with
existing generated file from rule 'cc-toolchain_s390x/usr/include'

The names that are passed to bazeldnf need to include the
directory part too, otherwise having two files with the same
name in different paths triggers a failure:

  + bazel run --config x86_64 //rpm:sandbox_s390x
  ...
  Error in _tar2files: generated file 'cc-toolchain_s390x/errno.h'
  in rule 'cc-toolchain_s390x/usr/include/asm' conflicts with
  existing generated file from rule 'cc-toolchain_s390x/usr/include'

Signed-off-by: Andrea Bolognani <[email protected]>
@rmohr
Copy link
Owner

rmohr commented Dec 12, 2023

Thanks Andrea!

@rmohr rmohr merged commit cc73488 into rmohr:main Dec 12, 2023
1 check passed
@rmohr
Copy link
Owner

rmohr commented Dec 12, 2023

@andreabolognani
Copy link
Collaborator Author

Excellent, thanks!

andreabolognani added a commit to andreabolognani/kubevirt that referenced this pull request Jan 29, 2024
This version contains a change needed for the upcoming s390x
support, namely

  rmohr/bazeldnf#66

Note that, as a consequence of that change, we need to update
the definition of libvirt-libs, as libvirt header files are
now inside the /usr/include/libvirt/ directory of the
generated tar file.

Signed-off-by: Andrea Bolognani <[email protected]>
andreabolognani added a commit to andreabolognani/kubevirt that referenced this pull request Jan 30, 2024
This version contains a change needed for the upcoming s390x
support, namely

  rmohr/bazeldnf#66

Note that, as a consequence of that change, we need to update
the definition of libvirt-libs, as libvirt header files are
now inside the /usr/include/libvirt/ directory of the
generated tar file.

Signed-off-by: Andrea Bolognani <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants